From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Sun, 25 Nov 2012 12:01:58 +0000 (+0100)
Subject: Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=b8a7c467960ffb4d5a5e1eef5f7783fb6f594542;p=project%2Fbcm63xx%2Fu-boot.git

Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
---

b8a7c467960ffb4d5a5e1eef5f7783fb6f594542